From 6136fbf309a6d78f1ccb62d96a57ee67e40fa07e Mon Sep 17 00:00:00 2001 From: Eli Zaretskii Date: Sat, 12 Oct 2013 11:48:31 +0300 Subject: [PATCH] Avoid compilation warnings in image.c. src/image.c (GIFLIB_MAJOR, GIFLIB_MINOR, GIFLIB_RELEASE): Move back after inclusion of gif_lib.h, thus fixing compiler warnings caused by revision 114614 (commit of 2013-10-10). --- src/ChangeLog | 6 ++++++ src/image.c | 26 +++++++++++++------------- 2 files changed, 19 insertions(+), 13 deletions(-) diff --git a/src/ChangeLog b/src/ChangeLog index 44ac339f420..bdce4a3e6f0 100644 --- a/src/ChangeLog +++ b/src/ChangeLog @@ -1,3 +1,9 @@ +2013-10-12 Eli Zaretskii + + * image.c (GIFLIB_MAJOR, GIFLIB_MINOR, GIFLIB_RELEASE): Move back + after inclusion of gif_lib.h, thus fixing compiler warnings caused + by revision 114614 (commit of 2013-10-10). + 2013-10-11 Eli Zaretskii * xdisp.c (deep_copy_glyph_row): Handle the case that FROM and TO diff --git a/src/image.c b/src/image.c index ca2ef67c0b9..bb3290a89f6 100644 --- a/src/image.c +++ b/src/image.c @@ -7203,21 +7203,8 @@ gif_image_p (Lisp_Object object) #ifdef HAVE_GIF -/* Giflib before 5.0 didn't define these macros. */ -#ifndef GIFLIB_MAJOR -#define GIFLIB_MAJOR 4 -#endif - #if defined (HAVE_NTGUI) -/* Giflib before 5.0 didn't define these macros (used only if HAVE_NTGUI). */ -#ifndef GIFLIB_MINOR -#define GIFLIB_MINOR 0 -#endif -#ifndef GIFLIB_RELEASE -#define GIFLIB_RELEASE 0 -#endif - /* winuser.h might define DrawText to DrawTextA or DrawTextW. Undefine before redefining to avoid a preprocessor warning. */ #ifdef DrawText @@ -7228,12 +7215,25 @@ gif_image_p (Lisp_Object object) #include #undef DrawText +/* Giflib before 5.0 didn't define these macros (used only if HAVE_NTGUI). */ +#ifndef GIFLIB_MINOR +#define GIFLIB_MINOR 0 +#endif +#ifndef GIFLIB_RELEASE +#define GIFLIB_RELEASE 0 +#endif + #else /* HAVE_NTGUI */ #include #endif /* HAVE_NTGUI */ +/* Giflib before 5.0 didn't define these macros. */ +#ifndef GIFLIB_MAJOR +#define GIFLIB_MAJOR 4 +#endif + #ifdef WINDOWSNT /* GIF library details. */ -- 2.30.2